Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Thu, 14 May 2015 11:01:11 +0000 (07:01 -0400)
committerTom Rini <[email protected]>
Thu, 14 May 2015 11:01:11 +0000 (07:01 -0400)

Trivial merge